From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 14 Sep 2011 04:20:20 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2142^2~18
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=922a5d71e37410182c0f6e4a4e09d381bc65d92b;p=emacs.git

Merge from trunk.
---

922a5d71e37410182c0f6e4a4e09d381bc65d92b